Merge: Time-stamp simplifications and fixes.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:21:19 +0000 (22:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:21:19 +0000 (22:21 -0700)

Trivial merge